From 39d64798e5cbc8786bad17add64d55a8f0487662 Mon Sep 17 00:00:00 2001 From: Antoine Musso Date: Mon, 1 May 2006 11:03:02 +0000 Subject: [PATCH] unused globals as per #3692 --- languages/LanguageCs.php | 1 - languages/LanguageCsb.php | 2 +- languages/LanguageCv.php | 2 -- languages/LanguageEo.php | 2 -- languages/LanguageEt.php | 2 +- languages/LanguageFr.php | 2 +- languages/LanguageFy.php | 1 - languages/LanguageIs.php | 1 - languages/LanguageJa.php | 1 - languages/LanguageKu.php | 2 +- languages/LanguageNn.php | 1 - languages/LanguageOs.php | 1 + languages/LanguageRu.php | 2 +- languages/LanguageSu.php | 2 +- languages/LanguageUdm.php | 1 + languages/LanguageVi.php | 4 ++-- languages/LanguageWa.php | 1 - languages/LanguageXal.php | 1 + 18 files changed, 11 insertions(+), 18 deletions(-) diff --git a/languages/LanguageCs.php b/languages/LanguageCs.php index 9d94d432ed..169a65bbc0 100644 --- a/languages/LanguageCs.php +++ b/languages/LanguageCs.php @@ -172,7 +172,6 @@ class LanguageCs extends LanguageUtf8 { } function checkTitleEncoding( $s ) { - global $wgInputEncoding; # Check for non-UTF-8 URLs; assume they are WinLatin2 $ishigh = preg_match( '/[\x80-\xff]/', $s); diff --git a/languages/LanguageCsb.php b/languages/LanguageCsb.php index a84499b623..890394f982 100644 --- a/languages/LanguageCsb.php +++ b/languages/LanguageCsb.php @@ -37,7 +37,7 @@ class LanguageCsb extends LanguageUtf8 { } function getMessage( $key ) { - global $wgAllMessagesCsb, $wgAllMessagesEn; + global $wgAllMessagesCsb; if( isset( $wgAllMessagesCsb[$key] ) ) { return $wgAllMessagesCsb[$key]; } else { diff --git a/languages/LanguageCv.php b/languages/LanguageCv.php index 26ca7ec404..88ca347b8b 100644 --- a/languages/LanguageCv.php +++ b/languages/LanguageCv.php @@ -55,8 +55,6 @@ class LanguageCv extends LanguageRu { function date( $ts, $adj = false, $format = true, $timecorrection = false ) { - global $wgUser; - if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); } $datePreference = $this->dateFormat( $format ); diff --git a/languages/LanguageEo.php b/languages/LanguageEo.php index 845915be98..b5bdf868f9 100644 --- a/languages/LanguageEo.php +++ b/languages/LanguageEo.php @@ -143,8 +143,6 @@ class LanguageEo extends LanguageUtf8 { } function checkTitleEncoding( $s ) { - global $wgInputEncoding; - # Check for X-system backwards-compatibility URLs $ishigh = preg_match( '/[\x80-\xff]/', $s); $isutf = preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' . diff --git a/languages/LanguageEt.php b/languages/LanguageEt.php index 4e2e4995b8..5ae62ab2fc 100644 --- a/languages/LanguageEt.php +++ b/languages/LanguageEt.php @@ -182,7 +182,7 @@ class LanguageEt extends LanguageUtf8 { * @return string */ function date( $ts, $adj = false, $format = true, $timecorrection = false ) { - global $wgAmericanDates, $wgUser; + global $wgAmericanDates; if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); } diff --git a/languages/LanguageFr.php b/languages/LanguageFr.php index eb619297cb..33f78daf72 100644 --- a/languages/LanguageFr.php +++ b/languages/LanguageFr.php @@ -97,7 +97,7 @@ class LanguageFr extends LanguageUtf8 { } function getMessage( $key ) { - global $wgAllMessagesFr, $wgAllMessagesEn; + global $wgAllMessagesFr; if( isset( $wgAllMessagesFr[$key] ) ) { return $wgAllMessagesFr[$key]; } else { diff --git a/languages/LanguageFy.php b/languages/LanguageFy.php index 08d90ea785..aec068f02c 100644 --- a/languages/LanguageFy.php +++ b/languages/LanguageFy.php @@ -108,7 +108,6 @@ class LanguageFy extends LanguageUtf8 { * @return string */ function date( $ts, $adj = false, $format = true, $timecorrection = false ) { - global $wgUser; if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); } diff --git a/languages/LanguageIs.php b/languages/LanguageIs.php index 739ddb9da2..3c504402bd 100644 --- a/languages/LanguageIs.php +++ b/languages/LanguageIs.php @@ -103,7 +103,6 @@ class LanguageIs extends LanguageUtf8 { } function date( $ts, $adj = false, $format = true) { - global $wgUser; if ( $adj ) { $ts = $this->userAdjust( $ts ); } # Adjust based on the timezone setting. $format = $this->dateFormat($format); diff --git a/languages/LanguageJa.php b/languages/LanguageJa.php index e5ad1b9402..5071b45bc3 100644 --- a/languages/LanguageJa.php +++ b/languages/LanguageJa.php @@ -128,7 +128,6 @@ class LanguageJa extends LanguageUtf8 { function stripForSearch( $string ) { # MySQL fulltext index doesn't grok utf-8, so we # need to fold cases and convert to hex - global $wikiLowerChars; $s = $string; # Strip known punctuation ? diff --git a/languages/LanguageKu.php b/languages/LanguageKu.php index bd39a36d51..4eed9fb670 100644 --- a/languages/LanguageKu.php +++ b/languages/LanguageKu.php @@ -40,7 +40,7 @@ class LanguageKu extends LanguageUtf8 { } function getMessage( $key ) { - global $wgAllMessagesKu, $wgAllMessagesEn; + global $wgAllMessagesKu; if( isset( $wgAllMessagesKu[$key] ) ) { return $wgAllMessagesKu[$key]; } else { diff --git a/languages/LanguageNn.php b/languages/LanguageNn.php index 174aa7485c..e21164b9f6 100644 --- a/languages/LanguageNn.php +++ b/languages/LanguageNn.php @@ -154,7 +154,6 @@ class LanguageNn extends LanguageUtf8 { } function time($ts, $adj = false, $format = true) { - global $wgUser; if ( $adj ) { $ts = $this->userAdjust( $ts ); } # Adjust based on the timezone setting. $format = $this->dateFormat($format); diff --git a/languages/LanguageOs.php b/languages/LanguageOs.php index 71331cc91c..ff09668f4f 100644 --- a/languages/LanguageOs.php +++ b/languages/LanguageOs.php @@ -50,6 +50,7 @@ if (!$wgCachedMessageArrays) { class LanguageOs extends LanguageRu { function LanguageOs() { + # FIXME: Are the globals really used ? global $wgNamespaceNamesOs, $wgMetaNamespace; LanguageUtf8::LanguageUtf8(); } diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php index a094804e02..5ffad05938 100644 --- a/languages/LanguageRu.php +++ b/languages/LanguageRu.php @@ -166,7 +166,7 @@ class LanguageRu extends LanguageUtf8 { # matter if they are wrong sometimes. Just add a special case for your site name if necessary. #join and array_slice instead mb_substr - + $ar = array(); preg_match_all( '/./us', $word, $ar ); if (!preg_match("/[a-zA-Z_]/us", $word)) switch ( $case ) { diff --git a/languages/LanguageSu.php b/languages/LanguageSu.php index 1774efc1cb..515863d11c 100644 --- a/languages/LanguageSu.php +++ b/languages/LanguageSu.php @@ -42,7 +42,7 @@ class LanguageSu extends LanguageUtf8 { } function getMessage( $key ) { - global $wgAllMessagesSu, $wgAllMessagesEn; + global $wgAllMessagesSu; if( isset( $wgAllMessagesSu[$key] ) ) { return $wgAllMessagesSu[$key]; } else { diff --git a/languages/LanguageUdm.php b/languages/LanguageUdm.php index 53a36cd7fc..142acd9b95 100644 --- a/languages/LanguageUdm.php +++ b/languages/LanguageUdm.php @@ -36,6 +36,7 @@ if (!$wgCachedMessageArrays) { class LanguageUdm extends LanguageRu { function LanguageUdm() { + # FIXME are the globals really used? global $wgNamespaceNamesUdm, $wgMetaNamespace; LanguageUtf8::LanguageUtf8(); } diff --git a/languages/LanguageVi.php b/languages/LanguageVi.php index c1c71e21b4..e6190131b9 100644 --- a/languages/LanguageVi.php +++ b/languages/LanguageVi.php @@ -127,7 +127,7 @@ class LanguageVi extends LanguageUtf8 { } function date( $ts, $adj = false, $format = true, $timecorrection = false ) { - global $wgAmericanDates, $wgUser; + global $wgAmericanDates; if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); } @@ -193,7 +193,7 @@ class LanguageVi extends LanguageUtf8 { } function getMessage( $key ) { - global $wgAllMessagesVi, $wgAllMessagesEn; + global $wgAllMessagesVi; if( isset( $wgAllMessagesVi[$key] ) ) { return $wgAllMessagesVi[$key]; } else { diff --git a/languages/LanguageWa.php b/languages/LanguageWa.php index 87ab8e4bb1..a1727a845e 100644 --- a/languages/LanguageWa.php +++ b/languages/LanguageWa.php @@ -71,7 +71,6 @@ class LanguageWa extends LanguageUtf8 { ### " d' " for months starting with a vowel ### function date( $ts, $adj = false ) { - global $wgAmericanDates, $wgUser, $wgUseDynamicDates; if ( $adj ) { $ts = $this->userAdjust( $ts ); } diff --git a/languages/LanguageXal.php b/languages/LanguageXal.php index cd28586b36..82f45c3c51 100644 --- a/languages/LanguageXal.php +++ b/languages/LanguageXal.php @@ -34,6 +34,7 @@ if (!$wgCachedMessageArrays) { class LanguageXal extends LanguageUtf8 { function LanguageXal() { + # FIXME are the globas really used? global $wgNamespaceNamesXal, $wgMetaNamespace; LanguageUtf8::LanguageUtf8(); } -- 2.20.1